Merge pull request #6555 from akatsoulas/500-delete-user-with-reply

Fix error on user deletion with reply

Author: akatsoulas

kitsune/questions/models.py

@@ -704,20 +704,15 @@ def is_taken(self):
         """
         Convenience method to check that a question is taken.
 
-        Additionally, if ``self.taken_until`` is in the past, this will reset
-        the database fields to expire the setting.
+        If the question is no longer validly taken (due to missing user or expired time),
+        this will reset the database fields and return False.
         """
-        if self.taken_by is None:
-            assert self.taken_until is None
-            return False
+        if self.taken_by is None or self.taken_until is None or self.taken_until < datetime.now():
 
-        assert self.taken_until is not None
-        if self.taken_until < datetime.now():
             self.taken_by = None
             self.taken_until = None
             self.save()
             return False
-
         return True
 
     def take(self, user, force=False):